]> git.neil.brown.name Git - wiggle.git/commit
git / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2e7ae20) | patch
Add heuristic to take shortcut when too slow.
authorNeilBrown <neil@brown.name>
Mon, 7 Sep 2020 07:34:05 +0000 (17:34 +1000)
committerNeilBrown <neil@brown.name>
Mon, 7 Sep 2020 08:34:47 +0000 (18:34 +1000)
commit69137a0b9cef7a0a11b1bed142f74a81d4f2bd09
treee6c26476524ef729c8f95f4269a637e3250a2b93tree | snapshot
parent2e7ae209c129937e501a9f9054eb07ce77a6f0a0commit | diff
Add heuristic to take shortcut when too slow.

If find_common takes more than 20msec to find the minimum edit distance,
take the next snake and assume it is good enough - and find sub-paths
before and after it.  This gets a result quickly, but maybe not the
best result.

Add option --shortest to get the best result.

Signed-off-by: NeilBrown <neil@brown.name>
12 files changed:
ReadMe.c diff | blob | history
diff.c diff | blob | history
tests/contrib/series/diff [new file with mode: 0644] blob
tests/contrib/series/ldiff [new file with mode: 0644] blob
tests/contrib/series/merge [new file with mode: 0644] blob
tests/contrib/series/new [new file with mode: 0644] blob
tests/contrib/series/new2 [new file with mode: 0644] blob
tests/contrib/series/orig [new file with mode: 0644] blob
vpatch.c diff | blob | history
wiggle.1 diff | blob | history
wiggle.c diff | blob | history
wiggle.h diff | blob | history
apply rejected patches and perform word-wise diffs